OOC-3753 - Merge remote-tracking branch 'upstream/main' into test-branch #198
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kathryn-dale
commented
Jun 27, 2024
masuk-kazi98
approved these changes
Jun 27, 2024
emilyjevans
reviewed
Jun 27, 2024
| @@ -1623,33 +1623,6 @@ | |||
| } | |||
| ] | |||
| }, | |||
| { | |||
There was a problem hiding this comment.
Were these ones just not used anymore?
There was a problem hiding this comment.
Yeah, they were defined but not used anywhere so I removed them to tidy the form up a bit
|
Have you tried deploying the branch to dev? Just curious if lots of dependency upgrades might break the deployment pipeline in some way |
Not yet but that's a good shout, I'll try deploying to dev now and let's see what happens |
emilyjevans
approved these changes
Jun 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This brings our repo back in line with upstream and will make future development work much easier.
It is going to need some very thorough dev review/testing to make sure I haven't missed anything when merging in the upstream changes.